merge with xen-unstable.hg
authorawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Tue, 5 Dec 2006 17:01:15 +0000 (10:01 -0700)
committerawilliam@xenbuild.aw <awilliam@xenbuild.aw>
Tue, 5 Dec 2006 17:01:15 +0000 (10:01 -0700)

Trivial merge